Fix handling of imported constant decls