This highlights that they really need to go into a struct or
bitmap for clarity, but I'm not doing that right before 3.0.1

Fixes	#986

Many Thanks To:	Kristian