Add TODO item.
Whitespace fix.
Remove unneeded slot name.
Factor out.
This is horrible.