Refactoring, cleaning up. About to change CrosshairMap for pre-enumFills use.