Small code refactor.

Signed-off-by: crynobone <crynobone@gmail.com>
Swap priority.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixed test case based on orchestral/extension@90b98ee changes.

Signed-off-by: crynobone <crynobone@gmail.com>