Improve support for Checkbox.