binstub spec refactor