EAGLESIX-2651: IfNull: misc formatting from 2.6.5 port