Implement #1663 "Make full radio/checkbox output optional"