Fix a gcc44 warning and remove a now-obsolete cast.