A bug fix in CModel::getAttributes(). As a side effect made the function...

... body shorter.