Fix #806: Slightly improve plugin template