Special case 'yes' values for type fields (#1876)