WAXFUNS need to go.
