HOPKINS: More 16b refactoring