Move callback method names to the only place they're used.