I agree that it is not easy to use. This is a consequence of missing (proper) abstraction and independence of display and work code. We do not want to repeat that for 3.1, so we should at least do it properly there. I will take care of this.