The rest of the changes to wavefronts

Missed a commit, oops.