remove wrong use of WANT_... macros