Make templates require Scheme enum struct wrapping

Make templates require Scheme enum struct wrapping #114