Neither version is amazingly readable, but the prior one was more self-consistent.