Cleanup a bit and make things more consistent.

Don't double check for NULLs and don't initialize if not necessary.
No functional changes.