Even more cleanup, some speedup.