Code simplification due to separate call/return conventions