Improve the logic in oq_dropdata a little.