Make state tables smaller

Why not. Not sure about impact on speed, but it's minor.