Also, update all references to the horizon special to use a #defined constant instead of a magic number.
