Yep, and a *lot* clearer on the intent of the code.