Small refactoring

Plus a question - it seems as though we have a missing case with
get hashmaps