move addFinalReturns to simplyExpressionsPre so it runs even in -g