A broad run of parametizing stuff to remove compiler warnings.  Issue #167
Merge branch 'master' of https://github.com/l1j/en