Here is what I hinted to in #204 (closed). I find this clearer to read. Do you agree with that change ?