Output reassignments

Explicit non-nil checks are usually redundant.