Fx & Beans: not putting code in common anymore (about to diverge sensibly anyway)