Mixed lists now also supported.
Small refactoring.