Updated signature to handle map special forms
Quote atoms for now