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