A few more API improvements.

This should make it more future-proof, as adding new options is easier
than adding new methods for each and every combination of options.