M117/Issue #181 - Initial reimplementation of aggregate/complex coverage.