Oops, previous commit broke every compiler except GCC, apply fix.