Issue #36: Attempted fix for clang builds.