Keep @mask_int internal, remove tests.