Knocked a few bytes off.
Back to the speed of the unexpanded version.