addons: Phase out pattern using global functions