Make parens optional and check for at prefix