Do not default to symbol
Remove FIXME about untested paths (they are tested)