Work on rewrite of wavefront loader.