Issue #160: Refacturing for better source code compatibility with Fil-C; needlessly "clever" code replaced with a more maintainable version.