Simplify assert conditions.
More formatting corrections.
Spread long statements across several lines.