Converted to single line if-return-commit.