dclass: Finish fixing compilation issues.  Now need to make changes to Astron.