I'm not sure why there are a bunch of empty implementations with just returns in them, but I fixed up some odd existing stuff.