Reorganise specs; Implement short-circuit boolean evaluation