Added some stuff to enable testing of two different ways to calculate the same value of self-clutter.