The earlier distinction continues to apply: in kināyah the literal sense remains permissible in principle, whereas majāz involves a contextual indication preventing the literal intended sense.
A generous person’s courtyard could literally contain ashes; that does not remove the rhetorical kināyah. But where context requires a transferred sense while excluding the literal one, the particular usage is analyzed under majāz.
The subtype of kināyah and the kināyah-versus-majāz distinction are separate questions.