Cleaned up list each operators in preparation for slice support.