Last-minute formatting changes and variable checks.