Refactored the epsilon code to use the same one now used in svn/trunk.