Fix inline whitespace skipping, add option