3.0 misc

- Change indentation to spaces in templates
- Use short array syntax

The failing tests are unrelated.