Fix for router.map et al.

Example of `router.map` in use.

![router_map](https://f.cloud.github.com/assets/3524633/346321/c5a361ce-9e3e-11e2-839c-ae94afada30c.png)