I am about to merge my 'non-faked-unicode' branch. Given the amount of changes I won't be suprised it it upsets the annotaton and/or code generators. /Arre