Removed some changes that were introduced to quell warnings on gcc.