Small cleanup and bugfix for input types.