Switched interpreter to using derived objects. Yikes!
Fixed some test breakage.