Some tweaks for the fun of it (now 1.03x speedup)