Minor reorder in constructor.