CAUSEWAY-3854: simplify (part 2)
5 files changed