landscape.io: Avoid some errors and smells (issue 11).