Converted remaining tupfiles to use new utility functions.