Code refactoring.

This commit no longer defines block types for callback. Callback block
are now defined at the methods that use them.