Consolidate a few functions.