Simplify the generics and make them policy compliant

Both generic now use the default masking/demasking mechanism instead of a there own solution. flagGeneric is now policy compliant.