Fix #550, #555, #556: Remove hack for underlying and classdata.