Properly strip end-of-option blanks