Quick fix for return types (see: topic/gilbert/plugin-api-tweaks).