Some refactoring mainly concerning pluggable fitness functions.