The %? and %?? tokens are ambiguous when used inside a multi-line macro. Add tokens %*? and %*?? that only expand during single-macro expansion. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>