Build 20, remove magic value deprecation