More optimization (probably worthless).