* Removed obsolete GET_HP macro.
* Const + reduced scope.