let partial handle keywords

It seems like this makes it way too overcomplicated though.