Add resolveBlockSubs() and resolvePassSubs() Tested.