Move some stuff from CLISH into the InputModel.