Some cleanups, but It seems luajit performs with this even worse. Need to continue benchmarking.