Changes to 'whilen...' and 'return' macros