Fixes LOGIC-118 by making prep* handle collections.