Version 010, window.x and log-message cleanup