types+grammar: fixing per review comments in #170