fix #1136 fill in some missing checks with shortcut refinement syntax