Also see if our fake escapers in cms_strftime can be replaced with something cleaner - of if we need to further extend that function.