PR: 3893 (sort of)
Submitted by: Igor Vinokurov <igor@cs.ibank.ru>
This will make a number of things easier in the future, as well as (finally!) avoiding the Id-smashing problem which has plagued developers for so long. Boy, I'm glad we're not using sup anymore. This update would have been insane otherwise.