Eliminate some redundant code.
Merge pull request #81 from pferraro/3.0

Eliminate some redundant code.