Some %assert_total cleanup

Just some of the lowest-hanging fruit - more to come!