Use more std::vector for solvate/insert-molecules