EZP-23474: Put comments in one line