Minor changes to make the code a little clearer. This is mostly restructuring code into an equivalent (but clearer) form.
Authored by: david_costanzo 2006-09-03
Parent: [r1545]
Child: [r1547]
