Rolling in @patrickkettner’s suggestions.