1.0.28.4: various macro source locations were off-by-one due to #-sb-xc