Some landscape.io fixes

From recent merges.

Unused imports, irregular indenting, redefine builtin.