Simplifying more bus stuff. Also truncated database type names.