fixup! Refactor OnSerialNumber behavior

Signed-off-by: Luke Stuyvenberg <stuyvenberg@wisc.edu>