finish adding explicit Block* arguments