Fix two spots where returning early prevented chainability