Misc simple extras with optionals

See https://github.com/pyca/cryptography/pull/331

This is stacked on https://github.com/pyca/cryptography/pull/333 so that should be merged before anything happens to this.