Code cleanup - make check/return look like all the other code in the module.