Small simplifications in BootstrapApplicationListener