Do the same with all the other Buffer::New calls

Issue #2.