Two new macros from my post on 2013-07-23