(fix) Remove special case handling.

Fixes #15.