Add parsing fix for smart property (rjust for cID < 8000001) and the De...

...X reversion for bad hack