Added a couple of @inlines