Behavior should be identical now to rev. 0b4a64ac6adbd6 (next: testing before constfo...