Further _.escape simplifications