Move more magic values into header...