Following through on a change to remove the UIButton extensions.