Replaced usage of placeholder tuple with maybe