Some cosmetic changes regarding NULL