Tidying up measurement scripts; no functional changes.