Also match on angle bracket pairs