Have 'chill' restore some macros for compatibility