poly_wavetype no longer hilariously occupies the namespace.