Use yaml variable format instead of options format where possible.