Pull the :else case into the macro