types+grammar: updates/corrections per review comments in #170