Iss #71 - Clean up magic numbers in common lib

With this change set, most of our magic numbers should be removed from the common code. There is one that is still kind of magic, but it at least has a comment explaining.