Fix some issues with offside-rule macro processing