Merge "Remove never-reached 'return' statements"