Scrutinizer changes
Make callbacks use consistent arg types