Refactor KeywordBuilder to account for SchemaDigester

A nice bonus is a much simpler code overall. Especially since the digester has
taken care of filtering out keywords which don't apply for the instance.

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>