Updated to make sure that most existing (2 of 3, anyway) custom input widgets work right.