Discussion with @esc24 is that the current behaviour is acceptable for the cases considered.