RFC109: Refactor Runtime Substitution Methods