Move options back to tail position; support kwargs as well.