Squashed series from wip-8820

Tests pass, code is lint clean, explanatory message added to assert