Got rid of some #set-s... more to come.