Work toward fixing a@b syntax.

These are some proposed changes; however, calling water all_layers.water
currently fails on this. I noticed that an or_index appears to have an
incorrect value at one point in the code, and I'd like to investigate
this next.