De-optimize more code so that GCC doesn't barf on it...