This is not my area but taking a look at ALLOWED_CUSTOM_INTERPOLATION_KEYS it appears you can use additional values for certain messages.
In particular:
%w[system_messages.welcome_user] => %w[username name name_or_username],
I think if we changed this to:
%w[system_messages.welcome_] => %w[username name name_or_username],
It would let you use those for other welcome messages. I’ll ask around.