[MATH-1038] Refactor code as agreed on the mailinglist.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1560531 13f79535-47bb-0310-9956-ffa450edef68