Revert "Small fixes to make old GCC happy"

This reverts commit 9624d6d9df85e4f603c91bf24e67789f16755ed4.