Revise spec to deal with imported decls properly