More minor cleanups. Tyler now signs off on this as ready to present.