Few other corner cases still remain.