Updates to check function usage, as well.