Also updates a few internal implementations of the same thing to use the
new built-in code.

Contributed by Arnon Yaari.