Also eat ';' and comments in attributes

Change-Id: Ib5a6ad22271e33216a20f235f71f6e1c52ca9739