Begin renaming in the scope checker
Warning removal
Wibble

 * Remove some extra space in an import
 * Remove an unnecessary blank line