[SFN] boilerplate changes in preparation to introduce nonbind markers