And these implementation cleanups for master: