Following patches will add more logic to them, so it's better to factor
them out now to keep the code clean. No functional changes.