Revert "word-at-a-time: make the interfaces truly generic"

This reverts commit 99782dabb9be9a847514f35fe40d7781ea25381b.
fix merge