Put generic declarations in one place; starting to consolidate schema manipulation functions in one place