OmeroCpp: Use correct typecasts
templates/combined.vm: Correctly forward declare wrapped types and upCast