Hotfixes

Here it would be better to just use `(remove nil ...`, which is shorter, blazing fast, and equivalent. :-)