#34: Some refactoring to make things a little nicer.  Haven't tested since the last commit.