Back to using 8 vars; for performance reasons.