#24 Removed superfluous const qualifier.

Also cleaned up a few other pedantic issues.