Added missing constexprs
Got rid of a copy when using callable_with()