Rewrite block rules to calculate their own blocks
Summary:
Following a simple request... T3321
Fixes T3321
Test Plan: Unit tests... eventually
Reviewers: epriestley
CC: aran, Korvin
Maniphest Tasks: T3321
Differential Revision: https://secure.phabricator.com/D6319