Lifted commit layout switch/case to the outer recursive function

And split the per-tag-type logic into separate helper functions. This keeps all of the tag checks on the same level but requires repeating the try/catch block (or invokeGuardedCallback) in each case before calling user code that might throw.