Silently ignore nulls here
Tiny cleanups and debug removal