You can take out this code since my pull request #2686 already takes care of it. The original logic needs to get flipped; it should be initialized to false and should only be assigned to true when we're appending a colon.