Split this assert into two.

If these fail, py.test can vomit: https://bitbucket.org/hpk42/pytest/issue/612/syntax-error-on-assertion-reinterpretation

(I lost track of what I did to make this asseriton vomit unfortunately :-()
Merge pull request #1415 from alex/assert-simplification

Split this assert into two.