Move options default fallback up where it belongs