A few miscs before another refactor-fest.