Fix indentation/spacing, remove more stuff.
Remove expensive checks from non-debug builds.