Merging options nicely

@c9s you were right, array_replace fixes it!