Merge "Replace scary buffer handling in addalias() with std::vector"