reorder args to the various vec, option fns so blk comes last
37 files changed