This reduces code duplication for hygiene, no functional changes. Change-Id: I10c96da4f07bcd1e5aabfcfbd115ecaef7bb65a1