Cleaned up schema definitions a bit.