Cleanup remaining box type permission code

From #1658.