That makes the code more readable, which is more important to me than
speed.  The stuff is difficult enough as it is.

[[Imported from SVN: r6214]]