Updates to assembler, more predicates