A few more API clean ups. Mainly revolving around user_ops.c