Fix version comparison.
Typemap fix.
Indentation fix.
Work around XS++ bug.
Fix method names.