Cleanup: remove some duplicated code.