[SATYR PATCH 1/4] Refactor handling of warnings