I'll do it in #310.  Already did just this function, but doing the others makes sense too.

-[Unknown]