Simplify Solution#length
Merge branch 'tidy-up-things'

* tidy-up-things:
  Simplify Solution#length