This reverts commit 1422e5f8. The renaming of parameters implicitly introduced "closure" annotations in the documentation which are wrong on callbacks.