Cosmetics.
Removed use of deprecated methods.
Cosmetics.
Bug 446380 - Problem with int(expression) in enumerator value