Properly working around gcc 4.4. defects