Re #312: Use provide instead of instance variables in templates to control layout.