Restructured hierarchy to avoid unnecessary setf entries.