use redefs and convert some defs into defns