A bit more cleanup to seeking.