Documentation and minor refactors for issue #3049