Don't need return keyword for these, but I'll fixup after merge. :)