Marc BookingTemplate.matcher as accessible.
Whitespace fixes.