performance changes since the affected functions are not expected to be
used frequently, but reduces the volume of code.