Merged [21104]: Using NSBundle's methods properly rather than making up our own paths...