STASHDEV-7788 Slight rearrangement in sequence of calls, should make almost no difference
except if any of the methods calls throw exceptions in future.