MORE fixes to make the brain-damaged GCC 4.9.x compiler happy.