Use helpers

Is this scenario still possible and do the changes above correctly account for it?  Depending on the answer there may need to be corresponding code tests.