Making discretionary right-turn junctions in Singapore safer