wavemap now compiles with -DSTRICT.