Merge pull request #24 from ellert/master

Break infinite recursion that leads to segfault.
Remove ancient no-op.
Fix bug 2460