Directly call methods instead of using call(:method)

(cherry picked from commit 6e9c3d1e98760278582c7840374c309d766ec647)