Reduce code duplication for initialisation options

Here you go. Be warned, this is breaking some tests and I do not know why.