Refactor some currently undefined variables so that they don't become
defined and cause chaos when I start integrating the prototype...