Fixed up some randomizable declarations.