Changed several functions and subroutines from their '2' version to their normal version.  There were '2' versions because previously the normal version was in 'WoodcockMC' only.  One such case exists, but the normal version is still in one of the 'KL' modules.