Yeah, that'd be cleaner. I'll add that in a future patch and change these then.