Removed CONST_XXX() macros as they are redundant and possibly confusing
removed osp_sub_result_mask typedef as it is implementation dependent
Cleanup and formatting fixes