Added RESTORE VERIFYONLY support
Whitespace cleaning