Deprecating the old variants which were not introspectable and cleaning a bit the API. Part-of: <!231>