Tweak many of the tax functions to make them actually work. #1744