Uncommitted tweaks per Steve McMillan circa 1/2014.