Start replacing secpolicy macros with wrappers.
Add additional secpolicy wrappers.