Bug 928231 follow-up - Rename the SIZE_OF_TABLES macro