Address some code style issues in the clone fix.