Some clean-up to the screenshot saving code.
Bring the screenshot code in line with vanilla 1.7 code.