update from mikeb: remove debug-return, remove macros