Finally fix constants in copy_fib, clean things up a little.