Support for 'return' in Volt macros, other minor fixes