Further consolidated non-BMP stuff into one recipe.

Added tests.
Fixed typos; tweaks.