CC: Changed attribute handling to better match C++.