Reduce verbosity reported in ATLASRECTS-4877. Also tidied headers a bit and moved some repetitive logic to a lambda.