[SQUASH ME] basic_mac: reduce some variable scope
[SQUASH ME] basic_mac: make registry getter a function