Comment by nickip

Worth doing before merge if you want the belt and suspenders.