Reflect changes in latest DC_General, PHPDoc corrections.