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