1.0.16.19: cleanups motivated by clisp host-2