fixup 'move variable_info to own file'