Merge all the things

Just in case someone wants to have some pity on me and merge SOMETHING, maybe you'd like to swing for the fences! This merges all three of my open pull requests and ties a little bow on it.