Form code factorization and basic embed suppression