Added @print deprecation statements, other spec changes from Kris