Correct code so its not using messy alias method, and protects all methods
Correct code so its not using messy alias method, and protects all methods

(was missing map and a few others)

MadBomber/message_bus,SamSaffron/message_bus,riking/message_bus,SamSaffron/message_bus,wlads/message_bus,MadBomber/message_bus,wlads/message_bus,cannikin/message_bus,riking/message_bus,menxu/message_bus,cannikin/message_bus,jemminger/message_bus,nathanstitt/message_bus,cannikin/message_bus,jemminger/message_bus,nathanstitt/message_bus,wlads/message_bus,MadBomber/message_bus,nathanstitt/message_bus,jemminger/message_bus,menxu/message_bus