remove most hand-assembly, eliminate Todd-isms