REL-1368: Code simplification.