Patches to add colons and trim as needed.