I'm not sure, but I think we may be looking to move to using `-callback` annotations. I'm checking with the rest of the Core team (the reason not to would be backwards compatibility)