More omx teardown tweaks.