Once #6778 is done, 2. will also be a one liner by changing this line. Why not wait for it?