Adding a few more support functions that will be used in future development. This commit was SVN r25684.