I definitely don't mind breaking compatibility and I agree that moving those to opts is better.