Don't bind blocks unnecessarily

Blocks in these methods did not need to be bound/captured. Speeds up this codepath somewhat and clarifies the logic slightly.

Removes redundant specs with behaviours covered elsewhere.