More cleanup and a subtle bigfix.