Simplify even more : remove useless indirection/abstration