I think `when-...` throughout it definitely the way forward.  It helps make it clear what you are talking about.