Revise to target gcc 4.6.1