Move to simpler use of 'yield' with iron-router.