Numeric reply bug fixes and cleanup.