Separate import statements out - the 1.2 spec doesn't say anything about imports so it's ambiguous as to whether this is correct or not.
Updating stuff.