Good catch.  I'll scrub the code in preparation for the Windows port.