Moved some members as public for closures