More work towards the API changes to support the qml-box2d branch