(refactor) Deduplicate operatingsystem fact resolution
(refactor) Use braces for one line blocks