Replace FEATURE_RETURN with ASSERT