Minor cleanup after refactoring functions.