Not sure how this got left behind. Little cleanup after conflict pulling from Chris' repo.