These small changes result in a speedup of about 30%. Original: 26d753eb650828ec61faae72afb28680f6850d00