Fix write method generation w/ upstream changes