Corrected numerous regressions.

While zeshy remains moderately broken, the tide is surely (if not
entirely swiftly) shifting.