Begin to migrate to extensible lookup (see maki).