types+grammar: more tweaks to ch4