Axe stump implementation, plus some refactoring.