Fix option reference, remove line continuation hack.