Minor cleanup that's not related to the changes other than I decided to fix it now.