Updating: minorly improving some macros.