Do some minor refactorings.