moving constants back out, they aren't super-widely used