Refactored #construct matcher