Handle shortening return statements

This is enabled in aggressive mode.