And use explicit arguments here instead too.