Refactor implicit options hash

Missed in c1fdc4d9458d9e87314d728d12dbfebf2c2519ae.
Fix an incomplete refactor