Some cleanups in the bulk element point mapping
Follow-up of !3990 (merged).
This MR contains just some cleanup work. No functionality changes are intended.
Follow-up of !3990 (merged).
This MR contains just some cleanup work. No functionality changes are intended.