Should we consider splitting these out into separate files like Blake2b?