move non-global config statements out of global tree