Attempt to solve lasting crash with thymiovpl on Windows, but moving things around.