Refactoring to take advantage of class/method waits.