Attempt to bring debug version into line -- not tested, not safe.