Lose the ERROR and RETURN macros.