Mmm, yep. Passing a string in to a function to do a look up on an object is a bad smell isn't it. Will fix.