Make Yarn::Trackable better, once again