Renamed BlockContext to BlockPlan.
Cleanup BlockPlan and others.