This reverts commit 0d0c2298. Includes a bug fix for fcmp one handling, as well as for positive constants.