minor optimization: remove one layer of indrection
Fix typo