Clean up old constants.
Fix short negative int bug.