Clean up return statements.