Typesafety is nice. And this way we can take benefit of the new size assert() the previous commit added. (cherry picked from commit 6e9417f5)