still a codegen problem with XyPO constructors. Fixed some problems, manually.