Okay, so we'll leave it as is (other than renaming that function call you mentioned below)?