Add in a better version of the OCD dumper.