Fix implicit "return" statement placement