Fix parsing of unbound / bound keywords