Fixed handling of some integer suffix corner cases