Issue 19: Make functions using constants use a parameter with constant as default.

This makes the constants defaults for arguments rather than being used directly in the functions.

NOTE 1 This does not handle the CONFIG constant as that is being handled by MR !12 (merged)

NOTE 2 The constants are still located at the top of the file. This may change as per #12 (closed)

closes #19 (closed)