I was trying to get less redundancy for composed a...

# strikt

[robfletcher]

I was trying to get less redundancy for composed assertions where the overall subject is the same as the individual ones & I have that now. I've added about 100 TODO comments in the process, though.