Fix keyword? usage and missing values.