Some surface-refactor-related tidying.