x86inc: Improve handling of %ifid with multi-token parameters