Package-wide OnTickSafe, imports cleanups