Minor changes to BlockTypeHolder
Make BlockTypeHolder iterable