various placeholders for <h<surkov fixes; bookmark all initial conversion branches