Associate comments after a value with that value, fixes #81

This was harder and uglier than I expected, but I think it works now.