Continued work on PHP code completion re-design