refactor: inline some methods

follow up for #638

/cc @kasperl