Drive-by: cruft removal.