Made all lexically scoped private subs into actual private subs so roles...

... can mess with them