Core: Make most *unit* funcs private