block: Remove "options" indirection from blockdev-add