idr.9: Clean up a bit.