I considered this while writing. Think this is clearer. Feel free to submit a commit that changes it though if you think this is wortwhile. Then we can compare.