Code

core: Improved style related to conditionals using many branches.