Cleanup some vi footer comments, rename new PRIVATE_* funcs to MacHaptic_*.