Grammar updates on opt_prefix, still broken (#17)