Remove some code duplication in startup.el