[FIX] Remove a couple more static table references

I think I've got them all now.