Change Details

This should make the code clearer.

This should make the code clearer. This required the adjustement of a hack in the code testing this code.

This should make the code clearer. This required the adjustement of a hack in the code testing this code.