Fixed code completion issues described in slisson/mps-tables#86