[PATCH GHAK16 V5 07/10] capabilities: remove a layer of conditional logic