Rewrite field assembly to match the C version

Gives a 10-15% speedup.