Clean up types related to dependency analysis