More explicit check for choice support (commit: fb7eed1)
Documentation and code cleanup (commit: 925fb24)