Fixed errors introduced by the last commit.  The unit test suite caught this almost immediately.