cleanup new GetOwner() code - so closer to compiling on gcc