Remove reliance on Matthias' personal helper functions.
Merge remote-tracking branch 'origin/master' into ari