r21090: Add some helper routines