cg: Another fix for formatting issues