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.

Author: Brian Vaughn