I'm kind of uncomfortable with this being special cased. is there a more uniform way of doing this?