EAGLESIX-3157: simplify top-level a little