types+grammar: more code/wording tweaks in ch2, per #170