Remove reliance on Matthias' personal helper functions.