Would you uncomment these and surround with an ifdef? That way you can fix the comment style ;-)