Improved a bit breadcrumb code.