Cleanup parse-span and add context syntax