Clearer comparison of the headers in the RPM
Reorganise into a series of steps
Get things working again
Better assertion failure message