Thanks to your brilliant idea I made another small change. No more aliases at all. Looks much cleaner now.