CORE-5832: correction for GNU-style long arguments