F and S codes take expr, not int
Merge branch 'master' into bool-class