Simplify the transformer thing

Don't create it then pass it around -- just create it where it's
needed.