Be more careful with callback types

Placate Tartan