Refactor|Sector: Replaced Sector accessor/helper macros