Actually support the options claimed in the README