Merge "Normalising return statements"