For ENG-5856, cure cancer of the semicolon and other Steve feedback