Remove some dead forward declarations
Factor out a bit of dynamic subclass creation on CDRSpec+XCTest