Merge "Differentiate comments with and without brackets"