Improve and simplify the code of making Toolbars accessible

Fixes #17