Added some more new list-based doctrines using the nested-list script. Updated script to deal with some quirks