Began correcting recently introduced regressions.

zeshy is lumbering closer to running sanely on startup. White light! White heat!