Add 'undefined's where appropriate because of argument lineup
Fix Servant.show's ability to take ids