Refactor 8a7efe5

Commit 8a7efe5 added a late binding method for the 'filename'
configuration default. This commit cleans up and refactors 8a7efe5 to
change from an early return to full conditional. It also removes the
commented code that was replaced by this new late binding method.
Lastly, it cleans up a spelling mistake in the comments.