Minor refactoring for splash-screen options. <Jaideep>