Halfway through porting to use traceurified-module