Move *PropDefs to o.a.c.cql3.statements