Issue #2351729: Improve assertions.
Issue #2351729: Add basic support for tags.