types+grammar: clarifying references, closes #160