UnconditionalJump parser + minor improvements