Preparation into adding repush flag to simplify assemly code