This fixes bootstrapping the builtins when no previous version of them exists after 2fe66bdb. Also fix a whitespace issue in that commit.