Fix option parsing so that passing --bucket_size after the device works

This makes supporting -U more annoying; dropping that for the moment,
unless someone complains