Issue #191: Memory-Safety changes.