Simplify normalization
Support wrapping long "return" lines