Cleaned up target feature enumeration and corresponding string mapping.
Updated for target feature enumeration changes.