Refactoring to use WaiLets.