Now with more type safety.

: #bug #ui