remove NO_INTMAP_POOL flag as now available via options at runtime. Fix a bunch of style issues