0c19bf4228
This is actually the one I wanted to fix in commit ad1bdf4e77,
but I didn't notice that we have two attributes and expressions.