- Some more options moved out from being hard-coded in block to top of file.