Minor cleanup of utility scripts.