I kind of like using the return code better, what do we think.  There's several places to make this change if we like it