remove all use of &rest but temporarily support it