Properly detect builds from Subversion
Remove some unnecessary null checks
Whitespace/formatting changes only.