Cleaning up some dirty code from progress indicator and callbacks development.