Looks like these last two cases can be collapsed into one now.