Move positional params into options array