in the FB case, you recently refactored these cases to be less verbose / common subexpression elimination.  It'd be nice if that optimisation was done in this branch too, for readability if no other reason :-)