Cleanup and fix for a mutability issue
Merge pull request #209 from halflings/master

Cleanup and fix for a mutability issue