main-cleanup-Identifier

Shaun Roerequested to merge
sroe/athena:main-cleanup-Identifier into main

Test and more concise implementation of ExpandedIdentifier::match(...). Other changes are cosmetic.

Merge request reports