Privatify lots of MacGitver core stuff