Removed even more compiler warnings.
p4#: 20220