Final simplifications of the sidebar module.