Cleaned up further sloppiness.