Now properly handles things like `name: ++`

This better supports autocomplete