Code clean-up to eliminate potential "dereferenced pointer" warning.