Fixes for #55 and #87 regarding extension attributes and elements.