Return code symbol and other enhancements.