Refactoring of tbd.list.* for consistency.