Revert "Minor refactoring in gennull."

This reverts commit 801ff0e65a4b7ef7839eddf00ef6053f39e168a9.