Merge "Work-around GCC polymorphism problems."