Oops, my bad - I've accidentally committed part of another development work which
does not belong in here. Please disregard this particular change.
I've double-checked all the patches and the rest seems fine - only those defines were
mistakenly committed.
cheers,
Max.