Now uses explicit watch1 and watch2 maps

Performance is fantastic, now runs more than twice as fast and uses
about half the memory.