Extended mechanical efficiency theorems for engines and heat pumps