Refactor so default MPG is named and used consistently.