Rewrite this as much as possible.  No functional changes.