Simplify warning API pending further discussion